Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:45 +0000 (13:28 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:45 +0000 (13:28 +0200)

Trivial merge